From d902349c4c7a1703afe6bb0fe263b719cec0a4ff Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 13 Jun 2007 14:16:41 +0000 Subject: [PATCH] updated patches that needed updating for the stable release --- debian/changelog | 5 ++-- debian/patches/00list | 3 +-- debian/patches/build_wo_debug_info.dpatch | 20 ---------------- debian/patches/install_ocamlbuild.dpatch | 28 +++++++++++------------ 4 files changed, 18 insertions(+), 38 deletions(-) delete mode 100755 debian/patches/build_wo_debug_info.dpatch diff --git a/debian/changelog b/debian/changelog index 40ea60b2..d23f2813 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,9 +5,10 @@ ocaml (3.10.0-1) UNRELEASED; urgency=low * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/, typing/, utils/} rather than as a flat dir tree * debian/patches/* - - removed: ocaml-interp_manpage (integrated upstream) + - removed: ocaml-interp_manpage, build_wo_debug_info (integrated upstream) + - updated: install_ocamlbuild - -- Stefano Zacchiroli Wed, 13 Jun 2007 14:37:10 +0200 + -- Stefano Zacchiroli Wed, 13 Jun 2007 16:15:14 +0200 ocaml (3.10.0~beta-1) experimental; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index b6b87c9d..7f45259f 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -7,5 +7,4 @@ call_ld_with_proper_flags.dpatch no_rpath.dpatch stdlib_man_section.dpatch install_scripts_config.dpatch -install_ocamlbuild.dpatch -build_wo_debug_info.dpatch +#install_ocamlbuild.dpatch diff --git a/debian/patches/build_wo_debug_info.dpatch b/debian/patches/build_wo_debug_info.dpatch deleted file mode 100755 index 57ab7d73..00000000 --- a/debian/patches/build_wo_debug_info.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## build_wo_debug_info.dpatch by Stefano Zacchiroli -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Avoid building with debugging info ocamldoc and camlp4. -## DP: Wont be needed for the stable release of ocaml 3.10.0. - -@DPATCH@ -diff -urNad ocaml-3.10.0~beta~/_tags ocaml-3.10.0~beta/_tags ---- ocaml-3.10.0~beta~/_tags 2007-03-04 12:00:26.000000000 +0100 -+++ ocaml-3.10.0~beta/_tags 2007-04-16 15:02:20.000000000 +0200 -@@ -12,6 +12,8 @@ - - # We want -g everywhere it's possible - true: debug -+: -debug -+: -debug - - # By default everything we link needs the stdlib - true: use_stdlib diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch index d646857f..2404484d 100755 --- a/debian/patches/install_ocamlbuild.dpatch +++ b/debian/patches/install_ocamlbuild.dpatch @@ -1,25 +1,25 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## foo.dpatch by Stefano Zacchiroli +## install_ocamlbuild.dpatch by Stefano Zacchiroli ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Install ocamlbuild uniformly with other ocaml binaries: bytecode version -## DP: with no extension, native version (if any) with .opt extension, avoid -## DP: installing the "best" binary +## DP: No description. @DPATCH@ -diff -urNad ocaml-3.10.0~beta~/build/partial-install.sh ocaml-3.10.0~beta/build/partial-install.sh ---- ocaml-3.10.0~beta~/build/partial-install.sh 2007-03-06 10:48:38.000000000 +0100 -+++ ocaml-3.10.0~beta/build/partial-install.sh 2007-04-15 17:38:04.000000000 +0200 -@@ -139,9 +139,9 @@ +diff -urNad ocaml-3.10.0~/build/partial-install.sh ocaml-3.10.0/build/partial-install.sh +--- ocaml-3.10.0~/build/partial-install.sh 2007-04-05 10:12:39.000000000 +0200 ++++ ocaml-3.10.0/build/partial-install.sh 2007-06-13 16:14:19.000000000 +0200 +@@ -141,9 +141,11 @@ echo "Installing ocamlbuild..." - --installbin ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE --installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE --installbestbin ocamlbuild/ocamlbuild.native$EXE ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE + cd ocamlbuild +-installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE +-installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE +-installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE ++#installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE +installbin ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE ++#installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE +installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE -+#installbestbin ocamlbuild/ocamlbuild.native$EXE ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE ++#installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE installlibdir \ - ocamlbuild/ocamlbuildlib.$A ocamlbuild/ocamlbuildlib.p.$A \ + ocamlbuildlib.$A \ -- 2.30.2